Reverting to pre-merge version.