Revert dc2ba1f..e418db4

This rolls back to commit dc2ba1f30d0dfc6f5dfbdf8582ef01e23819d315.