Revert 763eb21..76f00ab

This rolls back to commit 763eb2112bad4a02c7f45152d16dfed2a60fe3ce.