Revert cc643ce..756a356

This rolls back to commit cc643cea7f6dee813895363c740962aa055b22f6.