Revert a91762c..9741d9f

This rolls back to commit a91762ce674844548a8599966ed568434405ea68.
Merge branch 'test-rollback'