Revert 01917e3..5872e4d

This rolls back to commit 01917e3d9caff70d2d37510450e20d93a05a19a8.