Revert ef6e5ee..dda30a6

This rolls back to commit ef6e5ee45f7dabc2965359b00a14a7d56172c491.