#423; fix FOUC issues caused by last commit.