Revert a5d19e0..f7060a8

This rolls back to commit a5d19e0a5a8e2151642d4db788f466e1e610deca.