Revert 8b05b4b..32a00de

This rolls back to commit 8b05b4bc171847f0a39cfcadc10f385dd8bc2c6c.