Revert 5167a50..d4513af

This rolls back to commit 5167a50c2d5530e4d47ebe1e4b2fa399f7caf735.