remount now honours options

Fixes #1699