This reverts commit b3a23fa.

BS3 commit 5c7d339752f20627277ecd69945ae50508cefb8f