Revert bdebbae..bce098c

This rolls back to commit bdebbaed58a4044f29043e85d78d015b8ddecf63.