Revert 9f192b7..a283376

This rolls back to commit 9f192b77a9cbf2641f2dce7019663e99f89cbf69.