Revert "Keyable draw order and other fixes."

This reverts commit f174b1a3cb202b6cf4bfff227bc2336cf05d2e81.