Revert ed31e83..22fb35f

This rolls back to commit ed31e83dc27d52d994939b5befa4488f79f535a4.