Re-work rollbackCommand() to use filters [ci skip]