Revert 06b4ad0..6614dee

This rolls back to commit 06b4ad0a57517c40d160a9941195e1db71a53b31.