Revert c9bfae5..c4bc71e

This rolls back to commit c9bfae5a508965661a3421717503f6e820baad7f.
Revert 8160c00..3ae0ff5

This rolls back to commit 8160c00f321334d01082ab8ccaecd9a5d58c6b0f.