Revert da43c64..97704a5

This rolls back to commit da43c64afcd854dee80c360ddb9dad599903f301.