Revert 6a53367..3d3a94f

This rolls back to commit 6a5336723663ca1584a245c0ca1d4f50d7697bbe.