Revert 6593581..fdbdff4

This rolls back to commit 659358116d96c37e8b7079a701607ef117f56956.
h