some bus stuff

This reverts commit 51e59eb2bbbd3a42cf1a4a99a5bba69f1138ea1e.