Revert 8d1b6ab..85f6774

This rolls back to commit 8d1b6ab43c37b43d3a47d01e55cb0f079130eda2.