Revert a6f8302..b5d9884

This rolls back to commit a6f8302b621e5f9d322ff56979c4b79ac5a06c3b.