Revert f6d1b75..9bd3c99

This rolls back to commit f6d1b757e8c9662375de8a1ebbb2690e91b9de05.
Revert 9bd3c99..c5188a4

This rolls back to commit 9bd3c99cc73567349eda43abb21b5503f2db35d1.