Revert 5facdb9..5bdb19c

This rolls back to commit 5facdb917a4ee07ed38309314dda35a2c33035a8.