Revert ec4478f..0feb78b

This rolls back to commit ec4478f221c25f225ff637b65cc67e98228cdcfb.