Revert 8469dbf..49d10fa

This rolls back to commit 8469dbfafcc3ad3be04880e99f9d3731c60fffb7.
rollback