Revert ca1494d..db00c9d

This rolls back to commit ca1494d906b392bbb500abe73372c87f227f3ce0.