Revert bfdb243..c4fcb02

This rolls back to commit bfdb243074e668eab17cf18fe0218982f3bf1a63.