Revert eb2eec6..d3fe004

This rolls back to commit eb2eec606ad254d36c7452dbc813a77a4eba42fb.