This reverts commit f583029d, 0f94d68a and a2363c0c. Due to test failures from incorrect SB API usage.