Synchronized with Fredrik Janssons build.