Revert 56a5b51..88eee7d

This rolls back to commit 56a5b5165042c6faa6ebe3138b6790f8a9ad4246.