Revert ad001b5..568f253

This rolls back to commit ad001b52526a64d0d0c14633fdb7fba0769b28fd.