Revert 2da6e56..3729593

This rolls back to commit 2da6e56e6bef596887916488aee77c01169a53c7.