Revert 2731f86..edc110c

This rolls back to commit 2731f86d8b859c1c18af11d97c58e85299eeba4f.