Revert 97da754..736ded8

This rolls back to commit 97da754021e74ad3589ac2a2fcbd3ddf8ba2190e.