Revert 3d5eebe..7a40fa2

This rolls back to commit 3d5eebec35a0f4f389db813bcf908b8dd3623812.