Revert 520a3df..3431ae7

This rolls back to commit 520a3df6b235f9fe3460b4accaf70ad5baa23ac8.