This reverts commit c554dc7b7d. Functionality available in more general change in commit fb78378
c554dc7b7d
fb78378