Reverting changes made in prep for Angular adapter.