Revert a10f520..c72af9c

This rolls back to commit a10f5207b2cb7bb88720f0dbcbb54fb79c494c53.