Revert 109c353..3f66556

This rolls back to commit 109c353f6acbd5bdb15f1a670765e622ebef1200.