Revert 492feeb..b28311a

This rolls back to commit 492feebe42cc280f62c0f15064a94f461c2ecef4.