Revert 1e1ad04..1747d6d

This rolls back to commit 1e1ad04e1e857e0d33f3224b247747d5bf33aec4.