Revert 11b6c61..b17c40c

This rolls back to commit 11b6c61753fca5d62a3560fb2c6cc14fca39964b.