Revert 3ae5a72..6330cce

This rolls back to commit 3ae5a729bcbaeb7dde495bbdfdec83877577e153.