Reverted changes due to major crash.