Revert "MB-8602: Cleanup function call"
Revert "MB-8602: Cleanup function call"

This reverts commit edcce1afe2890d679a0f0a066f570abd1c19d1fa.

Change-Id: Iab66e9de42d3b98a7d335c0e8d139d51fdf73da6
Reviewed-on: http://review.couchbase.org/29507
Reviewed-by: Aliaksey Kandratsenka <340b8e09ca65cd3fc686427fcfed17e87eaf61e2@gmail.com>
Tested-by: Aliaksey Kandratsenka <340b8e09ca65cd3fc686427fcfed17e87eaf61e2@gmail.com>

ceejatec/ns_server,membase/ns_server,t3rm1n4l/ns_server,daverigby/ns_server,mschoch/ns_server,mschoch/ns_server,ceejatec/ns_server,daverigby/ns_server,t3rm1n4l/ns_server,ceejatec/ns_server,daverigby/ns_server,nimishzynga/ns_server,mschoch/ns_server,nimishzynga/ns_server,membase/ns_server,daverigby/ns_server,ceejatec/ns_server,t3rm1n4l/ns_server,mschoch/ns_server,vzasade/ns_server,vzasade/ns_server,vzasade/ns_server,t3rm1n4l/ns_server,membase/ns_server,membase/ns_server,mschoch/ns_server,vzasade/ns_server,membase/ns_server,nimishzynga/ns_server,nimishzynga/ns_server,ceejatec/ns_server,nimishzynga/ns_server,nimishzynga/ns_server,ceejatec/ns_server,t3rm1n4l/ns_server,mschoch/ns_server,membase/ns_server,daverigby/ns_server