Revert 974cc4f..78446c9

This rolls back to commit 974cc4fd3e89884de3f941406720d8d3da79c75d.
header