Revert 1f41ca9..31a421e

This rolls back to commit 1f41ca902a35b35c6d1326f43afe3ece012b4103.