Revert 7ccb694..a787173

This rolls back to commit 7ccb6941646e6a244110e614062b306e1b9d357a.