Revert 23bca1d..44a8b10

This rolls back to commit 23bca1dd7a7726530d6f4ef6a8502d56b8bc425d.