Revert 687d7f7..60a3a72

This rolls back to commit 687d7f7fcdf92f223e4f42506d2bb53de4b2cf23.