Revert d56f78a..4da118b

This rolls back to commit d56f78a9eb73a3b9fcbc34fb3641ece9e75d5865.