Revert bc18758..6f5112d

This rolls back to commit bc1875841bb6a43d7678385206cd9f9e00db5d6d.