Revert changes accidentally included in pull #2

These 3 commits were not part of public liquibase release, so need reverting.