Revert 6ed11db..f1a1b2c

This rolls back to commit 6ed11db14a7ec76a7a3ab0096141260910276676.