Revert 2b2a667..13b39c4

This rolls back to commit 2b2a667666af1e86ea7d9b4e87abd951ec601df6.