Revert 329600f..b6da653

This rolls back to commit 329600f89dbac43e5cb43dcdbd23fd4c0f28d286.