Revert 1f50be3..00ff23f

This rolls back to commit 1f50be311c674ab5f4109e237e83cf4bdac3b0ec.