Revert 5599dd2..d71065d

This rolls back to commit 5599dd2b85aa0dd73f2b659bfec79ffeea5e57eb.