Revert 3ad75fc..3346142

This rolls back to commit 3ad75fc070046f7ec49cc1aca92728b1bfb6b48c.