Revert cedf60b..6169bc0

This rolls back to commit cedf60bc3db805f233acaf9fe489244877e392c2.