Revert 6fc25df..bfc63f8

This rolls back to commit 6fc25dfe818a049f8367eb0058babfa3313ba7b6.