Revert fb6123e..1313855

This rolls back to commit fb6123e49519cc6379792d1dab79aab141733ab9.