Revert 81111be..08fb15c

This rolls back to commit 81111be9853a2fa9f46a846a482db8923f6f4723.