Revert 7643c92..48c5f7c

This rolls back to commit 7643c924d110e51b75487f41cb64c65de7cd779e.