Revert b4097bc..ed43e94

This rolls back to commit b4097bc243c9d6b1c92607a65ca8b6730635fc5b.