Revert 5b82f3b..1b409cf

This rolls back to commit 5b82f3b8cbd92426f4777e79d2129e076f904eef.