Revert 285348f..a4fee48

This rolls back to commit 285348f213a0b5f9711ef63af8ca48c7696c508b.
Revert 5130384..2929b36

This rolls back to commit 5130384dcd3448373d32d9ceca52c386d24b485b.