This reverts commit 53bb95a2. Code was working as designed/documented. Changing now will probably break other users.