Revert 8922861..3788771

This rolls back to commit 8922861d751fede4e05eba86589e34883333153b.
Skeleton and subtheme