Revert 6b84a41..a7e1417

This rolls back to commit 6b84a4166ec65ff84e0d7ae31bfd52432f45d203.