Revert b6d4828..4a22d1d

This rolls back to commit b6d48285e7279dc4e3191a98e9af5bdc3e280385.