Revert 8b88ae7..ea8bc29

This rolls back to commit 8b88ae79fd938aa44065bd464fea9f020d6ba428.