Revert 79a1dc0..b02b2b1

This rolls back to commit 79a1dc04c4ef9ebec195e644ef0f8084f8b17467.