Revert 4f90778..21c3295

This rolls back to commit 4f907788a3207363ebac8635994ff1a88d46c75f.