Revert 29e46a6..bdb2fd1

This rolls back to commit 29e46a6b668fc1d09a68ce267ff4ffcdd98f770b.