Task #WP-1137: remove return