Revert ade406c..e0348b2

This rolls back to commit ade406cb10d8d62a990c1d6912f5890df3a44789.