Revert 2d775ed..2adc296

This rolls back to commit 2d775edf7f3a5305859d8445fac80276d0d6642c.