Revert Ejay's commit