Revert 668553c..d2ead61

This rolls back to commit 668553c6dd2a7dcc16a19145fb54f867c4e150dc.