Revert 791b64a..94c2578

This rolls back to commit 791b64a3b820a72dd6b57613478c85dbd3b320c8.