Revert e460a88..55cb72e

This rolls back to commit e460a88f04b456cf7ad672e7a4b985f356259df7.