Revert 03dd422..de4aa20

This rolls back to commit 03dd422f42c316e3eefafccfe3137df087375e4e.