Revert b473f24dddc017f484718c367594a8ad2478eb70