Finish reverting #14444