Revert 63972f4..b4dad2c

This rolls back to commit 63972f4acecc9dd150a2f622d42bdb73ee8ec797.