Revert b54e5da..86d1678

This rolls back to commit b54e5dad42c2e6e83e6acf26fb0ec292087186a0.