Revert 1c57aa6..99e6e6c

This rolls back to commit 1c57aa600b51be7a90b254205a528dbf512d5681.
Revert 99e6e6c..b39a483

This rolls back to commit 99e6e6ce4abcb9c68779285412142e41dccdfb70.
Added sticky header