Revert "Merge remote-tracking branch 'origin/tower_dev'"

This reverts commit 115ba7dcd1ee399e3f959e396e93dc5aa89f8c08, reversing
changes made to c9926b7ad2a733f0fe9b96a78ecd7dcfc7c7236d.