Revert 98f31d1..d749b06

This rolls back to commit 98f31d19b761526cd1948c95a8a3c5fc93d7fca1.