Quick hack for bsw13
Revert "Quick hack for bsw13"

This reverts commit 751ec3ec277e665e87d02c924110aa6a39a98d8e.