Revert 260d5f3..97653ef

This rolls back to commit 260d5f3bf593418fb222e7479f42e749085af0a7.