Revert fb44782..eff8ece

This rolls back to commit fb44782d432eeca298edf711a29fbd78ebe966ec.