Revert d7530d4..3fb2566

This rolls back to commit d7530d4ec43ce9ac967a87656b17f2d4ca199e34.