Revert f9bc47c..0823ae4

This rolls back to commit f9bc47cec405aec463d54c6753ac55defc250be6.