Reapply of a revert because commit message was in wrong format Signed-off-by: stack <stack@apache.org>