Revert a7c2dc1..a24c224

This rolls back to commit a7c2dc13c6e109b2bde655f198b14366e5d5910c.