Revert 402b802..e1ced2e

This rolls back to commit 402b802766e44a14c15fa931f20039ccdb9cad2c.