Revert 3b50e65..09a33e6

This rolls back to commit 3b50e658010a8dc37efa090f5d741eecdf89304c.
nt