Reverted some changes to provide clean working branch.