Revert cf6fe57..6bf7a98

This rolls back to commit cf6fe57d58e391639a34541e14e470fe9c22e0af.