Revert 447ddea..3e7650b

This rolls back to commit 447ddea0b1b69ec5ea253ba3ed453c84eb565ebd.