This reverts commit 070e1c859fb2584c3dbe0a6fbe58cbc80938654e, reversing changes made to 3faeda67bb.
3faeda67bb