Revert a2ef939..2e1ba50

This rolls back to commit a2ef939247f6fde63c1bd6d5340958f98c6d538c.