Revert 42f9346..906219e

This rolls back to commit 42f93464cf9f76329bdd7187951e25fc307eccdf.
Revert a2c3f36..80eb0fe

This rolls back to commit a2c3f36b493ef27115c972f267448200f990e941.