Revert 54b06d9..0a29849

This rolls back to commit 54b06d9b0371b03c01dcc0fe348417ff4ee54dc5.