Revert 7f73d18..43de195

This rolls back to commit 7f73d187fda7c7a79db2d886c7aa601ac9c4f714.