Revert a2cec32..e795230

This rolls back to commit a2cec321260f2cf1b69c37b0b8e3a131719ed9cb.