Revert d5142e2..5f709a0

This rolls back to commit d5142e25408ffbd6c1aac5adb4bfebc8ad11356e.