Revert d4c0b4d..f8ffc57

This rolls back to commit d4c0b4d1ee914aea14616ddb5db04fdd9f3160f7.