Revert 07de37d..f2a6b02

This rolls back to commit 07de37da36602ebcba5ad2479f55d4da1fe08d1b.