This reverts commit 8c3a5d7059, which is no longer needed due to commit b2a5fa594e.
8c3a5d7059
b2a5fa594e