Revert 4c0d542..bdc6e61

This rolls back to commit 4c0d542cc4770094f52b99a6d9861bc62ba18430.