Revert a50e928..a62f379

This rolls back to commit a50e92896bdd718d733a57cd2f9e1e021b043fbb.