Caused a conflict with a higher-priority patch; temporary rollback for now. This reverts commit ba6d3fb7.