Revert "REST: Refactored / optimised existing withFormat method"

This reverts commit 97b5141efa0358ec744958e26ed8449046fa4ef1.