Revert d4d2508..efbcca3

This rolls back to commit d4d2508b72d233cdb6425d7c197e1e80e8f9c257.