Revert 266a6e9..3b4c7a6

This rolls back to commit 266a6e920fab83afab6db29a628ac424bf929bb3.