Revert 12161c9..6b89f85

This rolls back to commit 12161c907d8bee15577e8c41d778392bc2994f45.