Reinstate schema rollback

(cherry picked from commit 29af9ecd22e7f22637c5a2b537c2434d4bf2e981)