#1282 Reverted change to re-enable subscription request handling