Reverted to 6367462 commit