Revert a157bbe..a22a59d

This rolls back to commit a157bbe59238f435e9517b79af7ce7c7ec8ff98d.