Revert bda8644..3bb15e6

This rolls back to commit bda8644c78c9e0deb16bef9c234a13246b919d4d.