Revert e5a05d3..f1b9d47

This rolls back to commit e5a05d363c47385dff3ae81a9d42cef1197c1852.