Revert 9f2b383..0b21810

This rolls back to commit 9f2b383bdccaf06dd85915db0d8605d6e4bbfb70.