This reverts commit 0b393167ae9603e198b88bd6a53570ffd1e483d4, reversing changes made to c5413826168497c361bb7122f9910b267e1e8e50.
mentioned in commit c816eabd