Reverting couple more changes. This should put us back on a stable build.