t:qRevert "updated from Quartz master"

This reverts commit 9bbf950af25263c33729edbb61d90daba37ebb22, reversing
changes made to d89f0ad10ed70f828235cf6746c76a6574a6e411.