Revert 5be18af..e778832

This rolls back to commit 5be18afb8a14c13068228178379c70a4f31fbb7a.