Revert 2045323..4a6f0af

This rolls back to commit 20453236ffad280d203602f630e7e14c78865606.