Revert 43d3319..9905c49

This rolls back to commit 43d331914f4aae4dd216e7d636898d9c2bdbd716.