Revert 6c80529..3162857

This rolls back to commit 6c80529f9fd779b309553e94e22749c0d7c0ff6c.