Revert 225b542..1a10564

This rolls back to commit 225b54247d7abf147677f7dc9c68223de4f10720.