Revert 3c897cb..d86f9cb

This rolls back to commit 3c897cb2d7024ba107adb51f4a06e0cfe564bbe9.