NOTE: This commit is only around until this change gets pushed upstream
Fix indentation