Revert b03c3b2..f60f321

This rolls back to commit b03c3b289dc21837600369612512c60f3802e1f2.