Revert changes of 48295287