Revert f484ad0..874cc9b

This rolls back to commit f484ad08b610254cb38f7e2e6cdef22e589b783a.