This commit was mistakenly reverted in place of the actual failing commit prior; reapplying. This reverts commit db4170a4.