Revert b3c2f99..5439f75

This rolls back to commit b3c2f99848d18c09a360b91aa2716c0cd9f08711.
Trying to fix.