Revert b9cdc53