Revert 61425c3..f16b633

This rolls back to commit 61425c3d1a438c3ffe7e72af30a6c321c1b8906a.