Revert e0a2337..1b06d9e

This rolls back to commit e0a2337d563ca0674472970d4b3e7d10756b6298.