Revert bfdb243..6b5878e

This rolls back to commit bfdb243074e668eab17cf18fe0218982f3bf1a63.
njh

jhghj