Revert dbb3e27..fed40b6

This rolls back to commit dbb3e27d5d693c6f877563da22aa9ec726473d8e.