Revert 3df4ac5..7c6ae6d

This rolls back to commit 3df4ac55d1bcb8956caec8158dab1a606b103005.