Revert 5ffcae3..b64bd15

This rolls back to commit 5ffcae30c32879025de25a41a9cffc43f0033da8.