Revert 94ee8cb..ae9e42c

This rolls back to commit 94ee8cb24b241159eebb8d3ba95919dcb112b730.
Additions similar to 'codeguy/Slim-Skeleton'