Revert 153be29..4c776f6

This rolls back to commit 153be2973848fb976eedbf37ca2da30dc364479c.