Revert 84fac71..6344867

This rolls back to commit 84fac71750a191f12c4b70bcc5c7324d34f6d49c.