Rollback
blah
Revert "Merging master changes"

This reverts commit 5c5024689dbc51c090a2cb6f265cbd074ef5b59f, reversing
changes made to 83088059b99d79a6dd36bea24ea73202b0699b5e.
Removed header