Revert a91b31f..1e59239

This rolls back to commit a91b31f841f5be53ab7627e71053d2acb22c1f05.