Revert f6d6a53..b2044f5

This rolls back to commit f6d6a53e6631d85bd682890e078610d97320a801.