Revert 363bbc5..796ae1b

This rolls back to commit 363bbc5fdb4f3146802a0eaacbc2d80f1d561adb.