Revert a46bd35..86ec116

This rolls back to commit a46bd357eaae92f1e71f1cda1c292b66ddc5efd1.