Revert cc9011b..cbd333d

This rolls back to commit cc9011baa975142e3bb9db5e4da69a8d82489128.