Revert a53b5b7..b2a9985

This rolls back to commit a53b5b7170bdde3f2d4c37205535c0152247311f.