Revert 720f611..ca569fa

This rolls back to commit 720f611fe835185636a2ff8c4213aa1cad1b2c8a.